From: Didier Roche <didrocks@ubuntu.com>
Date: Thu, 18 Oct 2018 15:26:03 +0000 (+0200)
Subject: osdWindow: Ensure we setMaxLevel before setting Level itself
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~897^2~1^2~75
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ae7dd5e2db227d53ad2093e5691a4a9415499c13;p=gnome-shell.git

osdWindow: Ensure we setMaxLevel before setting Level itself

When maxLevel is > 100%, first OSD appearance was capping the current
level to 100%. Consecutives key press were then OK.
Ensure we setMaxLevel before setting Level itself, so that correct cap
value is applied.
---

diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js
index 9021c22d2..fb6587be0 100644
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -204,8 +204,8 @@ var OsdWindow = new Lang.Class({
     _reset() {
         this.actor.hide();
         this.setLabel(null);
-        this.setLevel(null);
         this.setMaxLevel(null);
+        this.setLevel(null);
     },
 
     _relayout() {
@@ -253,8 +253,8 @@ var OsdWindowManager = new Lang.Class({
     _showOsdWindow(monitorIndex, icon, label, level, maxLevel) {
         this._osdWindows[monitorIndex].setIcon(icon);
         this._osdWindows[monitorIndex].setLabel(label);
-        this._osdWindows[monitorIndex].setLevel(level);
         this._osdWindows[monitorIndex].setMaxLevel(maxLevel);
+        this._osdWindows[monitorIndex].setLevel(level);
         this._osdWindows[monitorIndex].show();
     },